Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 16 Apr 2012 15:21:26 +0000 (08:21 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 16 Apr 2012 15:21:26 +0000 (08:21 -0700)
commit7c57fc2925951e99cd48cd6c6bef1842fafc1664
tree2d9fb7e7b2ff2a8e8dceee197922695b300442e7
parentfccdc8e9846b596362c9b0743682a9d9a4c68fec
parent28777ab40924045b7699ce815c5a96c94f864f49
Merge from trunk.